20. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2020-08-17 08:36:36 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

20.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Porto v3.2.4/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_SocialFeed/templatesinstagramphotos.phtml2018-06-17 22:40:40 +0000
2/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Smartwave_SocialFeed/templatesinstagramphotos.phtml2020-08-17 05:06:04 +0000

20.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged532
Changed233
Inserted11
Removed11

20.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

20.4 Active regular expressions

No regular expressions were active.

20.5 Comparison detail

1 <?php 1 <?php
2 $_enable = $this->getConfig('sw_socialfeeds/instagram_photos/enable'); 2 $_enable = $this->getConfig('sw_socialfeeds/instagram_photos/enable');
3 if($_enable==1){ 3 if($_enable==1){
4     $accesstoken = $this->getConfig('sw_socialfeeds/instagram_photos/accesstocken'); 4     $accesstoken = $this->getConfig('sw_socialfeeds/instagram_photos/accesstocken');
5     $count = $this->getConfig('sw_socialfeeds/instagram_photos/showing_counts'); 5     $count = $this->getConfig('sw_socialfeeds/instagram_photos/showing_counts');
6     $user_id = $this->getConfig('sw_socialfeeds/instagram_photos/user_id');    
7     $padding = $this->getData("padding_item")!=''?'padding:'.$this->getData("padding_item").';':''; 6     $padding = $this->getData("padding_item")!=''?'padding:'.$this->getData("padding_item").';':'';
8 ?> 7 ?>
9     <div class="insta-items grid-items"> 8     <div class="insta-items grid-items">
10         <div class="photo-instagrams row"></div> 9         <div id="instafeed" class="photo-instagrams row" style="margin-left: -<?php echo $this->getData("padding_item"); ?>;margin-left: -<?php echo $this->getData("padding_item");?>;"></div>
11     </div> 10     </div>
12     <script type="text/javascript"> 11     <script type="text/javascript">
13         require([ 12         require([
14             'jquery'
 13             'jquery',
15         ], function ($
) {
 14             'instafeed'
16             var instaGram = $('.photo-instagrams'), 15         ], function ($,Instafeed) {
17                 userID = <?php echo $user_id;?>, 16           var feed = new Instafeed({
18                 token = '<?php echo $accesstoken;?>', 17             accessToken: '<?php echo $accesstoken;?>',
19                 count = <?php echo $count;?>; 18             template: '<div class="item col-xl-2 col-lg-3 col-sm4 col-6" style="<?php echo $padding;?>"><a lass="image-link" href="{{link}}"><img class="instagram-image" title="{{caption}}" src="{{image}}" /><span class="content"><i class="porto-icon-instagram"></i></span></a></div>',
20             var url = "https://api.instagram.com/v1/users/"+userID+"/media/recent/?access_token="+token; 19             limit: <?php echo $count;?>,
21             $.ajax({ 20             filter: function(image) {
22                 type: "GET", 21               return image.type === 'image';
23                 dataType: "jsonp",    
24                 cache: false,    
25                 url: url,    
26                 success: function(data) {    
27                     for (var i = 0; i < count; i++) {    
28                         if (data.data[i]) {    
29                             var caption = "";    
30                             if (data.data[i].caption) {    
31                                 caption = data.data[i].caption.text;    
32                             }    
33                             instaGram.append("<div class='col-xl-2 col-lg-3 col-sm4 col-6' style='<?php echo $padding;?>' data-date='"+data.data[i].created_time+"' data-sortid='"+i*2+"'><a class='image-link' target='_blank' href='" + data.data[i].link +"'><img class='instagram-image' src='" + data.data[i].images.low_resolution.url +"' /><span class='content'><i class='porto-icon-instagram'></i></span></a></div>");    
34                         }    
35                     }    
36                 } 22             }
37             }); 23           });
    24           feed.run();
38         }); 25         });
39     </script> 26     </script>
40 <?php }?> 27 <?php }?>